1 files changed, 237 insertions, 238 deletions
diff --git a/sources/shiboken2/doc/images/bindinggen-development.svg b/sources/shiboken2/doc/images/bindinggen-development.svg
index 3b6b3a26e..591e1f2d1 100644
--- a/sources/shiboken2/doc/images/bindinggen-development.svg
+++ b/sources/shiboken2/doc/images/bindinggen-development.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -12,9 +13,9 @@
    height="200"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
    version="1.0"
-   sodipodi:docname="bindgen-development.svg"
+   sodipodi:docname="bindinggen-development.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    inkscape:export-filename="bindinggen-development.png"
    inkscape:export-xdpi="90"
@@ -140,22 +141,24 @@
      objecttolerance="10"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.0859375"
-     inkscape:cx="320"
-     inkscape:cy="136.17463"
+     inkscape:zoom="0.76787377"
+     inkscape:cx="286.61779"
+     inkscape:cy="101.18182"
      inkscape:document-units="px"
-     inkscape:current-layer="g5658"
+     inkscape:current-layer="g5440"
      showgrid="false"
-     inkscape:window-width="1156"
-     inkscape:window-height="883"
-     inkscape:window-x="1396"
-     inkscape:window-y="35"
+     inkscape:window-width="1116"
+     inkscape:window-height="1042"
+     inkscape:window-x="10"
+     inkscape:window-y="28"
      showguides="true"
-     inkscape:guide-bbox="true">
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="0">
     <sodipodi:guide
        orientation="1,0"
        position="-557.55608,678.10875"
-       id="guide7299" />
+       id="guide7299"
+       inkscape:locked="false" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -176,7 +179,7 @@
     <flowRoot
        xml:space="preserve"
        id="flowRoot3229"
-       style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       style="font-style:normal;font-weight:normal;line-height:0.01%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        transform="translate(4.1137413,-2.3429609)"><flowRegion
          id="flowRegion3231"><rect
            id="rect3233"
@@ -184,166 +187,269 @@
            height="40.5849"
            x="388.45547"
            y="279.5423" /></flowRegion><flowPara
-         id="flowPara3235" /></flowRoot>    <g
+         id="flowPara3235"
+         style="font-size:40px;line-height:1.25"> </flowPara></flowRoot>    <g
        id="g5658"
        transform="translate(6.5767925,7.0112479)">
       <g
-         id="g5634">
+         transform="matrix(0,-1,1,0,697.50638,3244.256)"
+         id="g5624"
+         style="">
+        <g
+           id="g5626"
+           transform="matrix(0,-1,1,0,-294.81158,2953.0504)"
+           style="">
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-type="polyline"
+             id="path5628"
+             d="m 1586.5317,1348.2858 0.091,41.5266"
+             style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none"
+             inkscape:connector-curvature="0" />
+          <path
+             style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none"
+             d="m 1586.7489,1389.4756 7.9979,-9.1068"
+             id="path5630"
+             inkscape:connector-type="polyline"
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0" />
+          <path
+             style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none"
+             d="m 1586.6031,1389.5063 -7.9979,-9.1069"
+             id="path5632"
+             inkscape:connector-type="polyline"
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <g
+         transform="matrix(0,-1,1,0,908.50929,3242.9612)"
+         id="g5648"
+         style="">
+        <g
+           id="g5650"
+           transform="matrix(0,-1,1,0,-294.81158,2953.0504)"
+           style="">
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-type="polyline"
+             id="path5652"
+             d="m 1586.5317,1348.2858 0.091,41.5266"
+             style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none"
+             inkscape:connector-curvature="0" />
+          <path
+             style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none"
+             d="m 1586.7489,1389.4756 7.9979,-9.1068"
+             id="path5654"
+             inkscape:connector-type="polyline"
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0" />
+          <path
+             style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none"
+             d="m 1586.6031,1389.5063 -7.9979,-9.1069"
+             id="path5656"
+             inkscape:connector-type="polyline"
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <g
+         id="g5634"
+         style="">
         <g
            id="g6271"
-           transform="translate(1086.3689,746.93837)">
+           transform="translate(1086.3689,746.93837)"
+           style="">
           <g
              transform="matrix(0,-1,1,0,-294.81158,2953.0504)"
-             id="g6252">
+             id="g6252"
+             style="">
             <path
-               style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-               d="M 1586.5317,1300.2858 L 1586.6222,1389.8124"
+               style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none"
+               d="m 1586.5317,1300.2858 0.091,89.5266"
                id="path11089"
                inkscape:connector-type="polyline"
-               sodipodi:nodetypes="cc" />
+               sodipodi:nodetypes="cc"
+               inkscape:connector-curvature="0" />
             <path
                sodipodi:nodetypes="cc"
                inkscape:connector-type="polyline"
                id="path2758"
-               d="M 1586.7489,1389.4756 L 1594.7468,1380.3688"
-               style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
+               d="m 1586.7489,1389.4756 7.9979,-9.1068"
+               style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none"
+               inkscape:connector-curvature="0" />
             <path
                sodipodi:nodetypes="cc"
                inkscape:connector-type="polyline"
                id="path2760"
-               d="M 1586.6031,1389.5063 L 1578.6052,1380.3994"
-               style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
+               d="m 1586.6031,1389.5063 -7.9979,-9.1069"
+               style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none"
+               inkscape:connector-curvature="0" />
           </g>
         </g>
       </g>
       <g
-         transform="translate(134.35978,44.472131)"
-         id="g2777">
-        <rect
-           style="fill:#addc52;fill-opacity:1;stroke:#6ca400;stroke-width:0.82399696;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5172"
-           width="185.49777"
-           height="75.08918"
-           x="2047.775"
-           y="2029.4594"
-           ry="3.0323718"
-           rx="2.6724329" />
-        <text
-           xml:space="preserve"
-           style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#035800;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-           x="2140.5562"
-           y="2062.9375"
-           id="text5174"><tspan
-             sodipodi:role="line"
-             x="2140.5562"
-             y="2062.9375"
-             style="font-size:22px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#050800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-             id="tspan5176">Qt bindings</tspan><tspan
-             id="tspan6109"
-             sodipodi:role="line"
-             x="2140.5562"
-             y="2084.457"
-             style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#050800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">(generated code)</tspan></text>
-      </g>
-      <g
-         transform="translate(141.86951,-31.391207)"
-         id="g3216">
-        <rect
-           style="fill:#bff3bc;fill-opacity:1;stroke:#0af400;stroke-width:0.64492828;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect3625"
-           width="185.67708"
-           height="75.268074"
-           x="1829.1727"
-           y="2105.2332"
-           ry="2.3353095"
-           rx="2.1257713" />
-        <text
-           xml:space="preserve"
-           style="font-size:38.71272278px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#035800;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-           x="1921.9705"
-           y="2136.9409"
-           id="text3627"
-           transform="scale(1.0000266,0.9999734)"><tspan
-             id="tspan3697"
-             sodipodi:role="line"
-             x="1921.9705"
-             y="2136.9409"
-             style="font-size:21.29199791px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#035800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold">generator</tspan><tspan
-             sodipodi:role="line"
-             x="1921.9705"
-             y="2163.5559"
-             style="font-size:21.29199791px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#035800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-             id="tspan2464">front-end</tspan></text>
-      </g>
-      <g
-         id="g5641">
+         id="g5641"
+         style="">
         <g
            id="g5465"
-           transform="translate(874.42628,746.93837)">
+           transform="translate(874.42628,746.93837)"
+           style="">
           <g
              transform="matrix(0,-1,1,0,-294.81158,2953.0504)"
-             id="g5467">
+             id="g5467"
+             style="">
             <path
-               style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-               d="M 1586.5317,1300.2858 L 1586.6222,1389.8124"
+               style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none"
+               d="m 1586.5317,1300.2858 0.091,89.5266"
                id="path5469"
                inkscape:connector-type="polyline"
-               sodipodi:nodetypes="cc" />
+               sodipodi:nodetypes="cc"
+               inkscape:connector-curvature="0" />
             <path
                sodipodi:nodetypes="cc"
                inkscape:connector-type="polyline"
                id="path5471"
-               d="M 1586.7489,1389.4756 L 1594.7468,1380.3688"
-               style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
+               d="m 1586.7489,1389.4756 7.9979,-9.1068"
+               style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none"
+               inkscape:connector-curvature="0" />
             <path
                sodipodi:nodetypes="cc"
                inkscape:connector-type="polyline"
                id="path5473"
-               d="M 1586.6031,1389.5063 L 1578.6052,1380.3994"
-               style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
+               d="m 1586.6031,1389.5063 -7.9979,-9.1069"
+               style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none"
+               inkscape:connector-curvature="0" />
           </g>
         </g>
       </g>
       <g
          transform="translate(-194.79968,-212.08495)"
          id="g5440">
-        <rect
-           rx="1.2158648"
-           ry="2.9911308"
-           y="2285.8806"
-           x="1953.809"
-           height="75.360634"
-           width="185.76964"
-           id="rect3166"
-           style="fill:#dfe994;fill-opacity:1;stroke:#d5f400;stroke-width:0.55236381;stroke-opacity:1" />
+        <path
+           style="fill:#41cd52;fill-opacity:1;stroke:none;stroke-width:2.18747473;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 2378.6251,2292.247 v 66.9548 h 171.1068 l 14.8788,-14.8788 v -66.9549 h -171.1068 z"
+           id="path3715-5-6-7-9-8-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccc" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:0%;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.29069424px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+           x="2471.614"
+           y="2309.093"
+           id="text5174"><tspan
+             sodipodi:role="line"
+             x="2471.614"
+             y="2309.093"
+             style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.29069424px;"
+             id="tspan953">Qt for Python</tspan><tspan
+             id="tspan6109"
+             sodipodi:role="line"
+             x="2471.614"
+             y="2339.093"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.29069424px;">(generated code)</tspan></text>
+        <path
+           style="fill:#6b7080;fill-opacity:1;stroke:none;stroke-width:2.18747473;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 2166.5963,2292.247 v 66.9548 h 171.1068 l 14.8788,-14.8788 v -66.9549 h -171.1068 z"
+           id="path3715-5-6-7-9-8-7-9-94"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccc" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:0%;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.50930572px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+           x="2259.1294"
+           y="2311.0505"
+           id="text3627"
+           transform="scale(1.0000266,0.9999734)"><tspan
+             id="tspan3697"
+             sodipodi:role="line"
+             x="2259.1294"
+             y="2311.0505"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.50930572px;">generator</tspan><tspan
+             sodipodi:role="line"
+             x="2259.1294"
+             y="2341.0505"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.50930572px;"
+             id="tspan2464">front-end</tspan></text>
+        <path
+           style="fill:#6b7080;fill-opacity:1;stroke:none;stroke-width:2.18747473;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 1959.8625,2292.2469 v 66.9548 h 171.1068 l 14.8788,-14.8788 v -66.9549 h -171.1068 z"
+           id="path3715-5-6-7-9-8-7-9-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccc" />
         <text
            id="text3168"
-           y="2328.8809"
-           x="2046.646"
-           style="font-size:27.94354057px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#4c5800;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+           y="2326.4568"
+           x="2052.7678"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:0%;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.65129721px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
            xml:space="preserve"><tspan
-             style="font-size:19.56047821px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#4c5800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-             y="2328.8809"
-             x="2046.646"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.65129721px;"
+             y="2326.4568"
+             x="2052.7678"
              sodipodi:role="line"
              id="tspan5424">API Extractor</tspan></text>
+        <path
+           style="fill:#9d9faa;fill-opacity:1;stroke:none;stroke-width:2.18747473;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 2378.6251,2393.0867 v 66.9548 h 171.1068 l 14.8788,-14.8788 v -66.9549 h -171.1068 z"
+           id="path3715-5-6-7-9-8-7-9-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccc" />
+        <text
+           id="text3487"
+           y="2410.3647"
+           x="2471.614"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:0%;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.44197154px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+           xml:space="preserve"><tspan
+             id="tspan2509"
+             style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.44197154px;"
+             y="2410.3647"
+             x="2471.614"
+             sodipodi:role="line">typesystem</tspan><tspan
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.44197154px;"
+             y="2440.3647"
+             x="2471.614"
+             sodipodi:role="line"
+             id="tspan5432">(handwritten)</tspan></text>
+        <path
+           style="fill:#9d9faa;fill-opacity:1;stroke:none;stroke-width:2.18747473;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 2166.5963,2394.0075 v 66.9548 h 171.1068 l 14.8788,-14.8788 v -66.9549 h -171.1068 z"
+           id="path3715-5-6-7-9-8-7-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccc" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:0%;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.58586931px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+           x="2259.5852"
+           y="2412.0415"
+           id="text2735"><tspan
+             sodipodi:role="line"
+             x="2259.5852"
+             y="2412.0415"
+             style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.58586931px;"
+             id="tspan2737">injected code</tspan><tspan
+             id="tspan2743"
+             sodipodi:role="line"
+             x="2259.5852"
+             y="2442.0415"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.58586931px;">(handwritten)</tspan></text>
       </g>
       <g
          transform="translate(-102.30216,-279.71223)"
-         id="g5541">
+         id="g5541"
+         style="stroke:none">
         <path
            sodipodi:type="arc"
-           style="fill:#f28888;fill-opacity:1;stroke:#d5f400;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
+           style="fill:#f28888;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
            id="path5535"
            sodipodi:cx="255.10791"
            sodipodi:cy="326.69064"
            sodipodi:rx="38.848923"
            sodipodi:ry="38.848923"
-           d="M 293.95683,326.69064 A 38.848923,38.848923 0 1 1 216.25899,326.69064 A 38.848923,38.848923 0 1 1 293.95683,326.69064 z"
+           d="m 293.95683,326.69064 a 38.848923,38.848923 0 0 1 -38.84892,38.84893 38.848923,38.848923 0 0 1 -38.84892,-38.84893 38.848923,38.848923 0 0 1 38.84892,-38.84892 38.848923,38.848923 0 0 1 38.84892,38.84892 z"
            transform="matrix(0.4405339,0,0,0.4405339,1842.2283,2282.9708)" />
         <text
            xml:space="preserve"
-           style="font-size:27.62000275px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+           style="font-style:normal;font-weight:normal;line-height:0%;font-family:Titillium;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;-inkscape-font-specification:'Titillium, Normal';font-stretch:normal;font-variant:normal;font-size:26.66666667px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal"
            x="1946.3259"
            y="2435.7"
            id="text5537"><tspan
@@ -351,24 +457,25 @@
              id="tspan5539"
              x="1946.3259"
              y="2435.7"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:FreeMono;-inkscape-font-specification:FreeMono Bold">1</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666667px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;stroke:none">1</tspan></text>
       </g>
       <g
          transform="translate(52.589867,-352.69787)"
-         id="g5546">
+         id="g5546"
+         style="stroke:none">
         <path
            sodipodi:type="arc"
-           style="fill:#f28888;fill-opacity:1;stroke:#d5f400;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
+           style="fill:#f28888;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
            id="path5548"
            sodipodi:cx="255.10791"
            sodipodi:cy="326.69064"
            sodipodi:rx="38.848923"
            sodipodi:ry="38.848923"
-           d="M 293.95683,326.69064 A 38.848923,38.848923 0 1 1 216.25899,326.69064 A 38.848923,38.848923 0 1 1 293.95683,326.69064 z"
+           d="m 293.95683,326.69064 a 38.848923,38.848923 0 0 1 -38.84892,38.84893 38.848923,38.848923 0 0 1 -38.84892,-38.84893 38.848923,38.848923 0 0 1 38.84892,-38.84892 38.848923,38.848923 0 0 1 38.84892,38.84892 z"
            transform="matrix(0.4405339,0,0,0.4405339,1842.2283,2282.9708)" />
         <text
            xml:space="preserve"
-           style="font-size:27.62000275px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+           style="font-style:normal;font-weight:normal;line-height:0%;font-family:Titillium;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;-inkscape-font-specification:'Titillium, Normal';font-stretch:normal;font-variant:normal;font-size:26.66666667px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal"
            x="1946.3259"
            y="2435.7"
            id="text5550"><tspan
@@ -376,134 +483,25 @@
              id="tspan5552"
              x="1946.3259"
              y="2435.7"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:FreeMono;-inkscape-font-specification:FreeMono Bold">2</tspan></text>
-      </g>
-      <g
-         transform="matrix(0,-1,1,0,697.50638,3244.256)"
-         id="g5624">
-        <g
-           id="g5626"
-           transform="matrix(0,-1,1,0,-294.81158,2953.0504)">
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-type="polyline"
-             id="path5628"
-             d="M 1586.5317,1348.2858 L 1586.6222,1389.8124"
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-             d="M 1586.7489,1389.4756 L 1594.7468,1380.3688"
-             id="path5630"
-             inkscape:connector-type="polyline"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-             d="M 1586.6031,1389.5063 L 1578.6052,1380.3994"
-             id="path5632"
-             inkscape:connector-type="polyline"
-             sodipodi:nodetypes="cc" />
-        </g>
-      </g>
-      <g
-         transform="translate(5.3442137,15.993306)"
-         id="g5459">
-        <rect
-           rx="2.4652832"
-           ry="2.9818845"
-           y="2151.3206"
-           x="1965.7682"
-           height="75.127686"
-           width="185.53668"
-           id="rect3485"
-           style="fill:#b2e994;fill-opacity:1;stroke:#56f400;stroke-width:0.78531456;stroke-opacity:1" />
-        <text
-           id="text3487"
-           y="2184.2461"
-           x="2059.1909"
-           style="font-size:27.94354057px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#1f5800;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-           xml:space="preserve"><tspan
-             id="tspan2509"
-             style="font-size:19.56047821px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#1f5800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-             y="2184.2461"
-             x="2059.1909"
-             sodipodi:role="line">typesystem</tspan><tspan
-             style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#1f5800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-             y="2205.1477"
-             x="2059.1909"
-             sodipodi:role="line"
-             id="tspan5432">(handwritten)</tspan></text>
-      </g>
-      <g
-         transform="matrix(0,-1,1,0,908.50929,3242.9612)"
-         id="g5648">
-        <g
-           id="g5650"
-           transform="matrix(0,-1,1,0,-294.81158,2953.0504)">
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-type="polyline"
-             id="path5652"
-             d="M 1586.5317,1348.2858 L 1586.6222,1389.8124"
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-             d="M 1586.7489,1389.4756 L 1594.7468,1380.3688"
-             id="path5654"
-             inkscape:connector-type="polyline"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-             d="M 1586.6031,1389.5063 L 1578.6052,1380.3994"
-             id="path5656"
-             inkscape:connector-type="polyline"
-             sodipodi:nodetypes="cc" />
-        </g>
-      </g>
-      <g
-         transform="translate(299.78191,21.148391)"
-         id="g2771">
-        <rect
-           style="fill:#cce994;fill-opacity:1;stroke:#a1f400;stroke-width:0.62429351;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect2733"
-           width="185.69771"
-           height="75.288704"
-           x="1882.2529"
-           y="2146.085"
-           ry="2.2607138"
-           rx="2.0576432" />
-        <text
-           xml:space="preserve"
-           style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#3a5800;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-           x="1975.134"
-           y="2180.2722"
-           id="text2735"><tspan
-             sodipodi:role="line"
-             x="1975.134"
-             y="2180.2722"
-             style="font-size:22px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#3a5800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-             id="tspan2737">injected code</tspan><tspan
-             id="tspan2743"
-             sodipodi:role="line"
-             x="1975.134"
-             y="2201.7917"
-             style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#3a5800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">(handwritten)</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666667px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;stroke:none">2</tspan></text>
       </g>
       <g
          transform="translate(200.4676,-222.96766)"
-         id="g5554">
+         id="g5554"
+         style="stroke:none">
         <path
            sodipodi:type="arc"
-           style="fill:#f28888;fill-opacity:1;stroke:#d5f400;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
+           style="fill:#f28888;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
            id="path5556"
            sodipodi:cx="255.10791"
            sodipodi:cy="326.69064"
            sodipodi:rx="38.848923"
            sodipodi:ry="38.848923"
-           d="M 293.95683,326.69064 A 38.848923,38.848923 0 1 1 216.25899,326.69064 A 38.848923,38.848923 0 1 1 293.95683,326.69064 z"
+           d="m 293.95683,326.69064 a 38.848923,38.848923 0 0 1 -38.84892,38.84893 38.848923,38.848923 0 0 1 -38.84892,-38.84893 38.848923,38.848923 0 0 1 38.84892,-38.84892 38.848923,38.848923 0 0 1 38.84892,38.84892 z"
            transform="matrix(0.4405339,0,0,0.4405339,1842.2283,2282.9708)" />
         <text
            xml:space="preserve"
-           style="font-size:27.62000275px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+           style="font-style:normal;font-weight:normal;line-height:0%;font-family:Titillium;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;-inkscape-font-specification:'Titillium, Normal';font-stretch:normal;font-variant:normal;font-size:26.66666667px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal"
            x="1946.3259"
            y="2435.7"
            id="text5558"><tspan
@@ -511,24 +509,25 @@
              id="tspan5560"
              x="1946.3259"
              y="2435.7"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:FreeMono;-inkscape-font-specification:FreeMono Bold">3</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666667px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;stroke:none">3</tspan></text>
       </g>
       <g
          transform="translate(413.633,-206.84535)"
-         id="g5562">
+         id="g5562"
+         style="stroke:none">
         <path
            sodipodi:type="arc"
-           style="fill:#f28888;fill-opacity:1;stroke:#d5f400;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
+           style="fill:#f28888;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
            id="path5564"
            sodipodi:cx="255.10791"
            sodipodi:cy="326.69064"
            sodipodi:rx="38.848923"
            sodipodi:ry="38.848923"
-           d="M 293.95683,326.69064 A 38.848923,38.848923 0 1 1 216.25899,326.69064 A 38.848923,38.848923 0 1 1 293.95683,326.69064 z"
+           d="m 293.95683,326.69064 a 38.848923,38.848923 0 0 1 -38.84892,38.84893 38.848923,38.848923 0 0 1 -38.84892,-38.84893 38.848923,38.848923 0 0 1 38.84892,-38.84892 38.848923,38.848923 0 0 1 38.84892,38.84892 z"
            transform="matrix(0.4405339,0,0,0.4405339,1842.2283,2282.9708)" />
         <text
            xml:space="preserve"
-           style="font-size:27.62000275px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+           style="font-style:normal;font-weight:normal;line-height:0%;font-family:Titillium;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;-inkscape-font-specification:'Titillium, Normal';font-stretch:normal;font-variant:normal;font-size:26.66666667px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal"
            x="1946.3259"
            y="2435.7"
            id="text5566"><tspan
@@ -536,7 +535,7 @@
              id="tspan5568"
              x="1946.3259"
              y="2435.7"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:FreeMono;-inkscape-font-specification:FreeMono Bold">4</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666667px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;stroke:none">4</tspan></text>
       </g>
     </g>
   </g>