diff --git a/Makefile b/Makefile index 3dc13e2..a0cdc80 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all: postZfa postZfhmin preZfhmin postZvfhmin insideZvfhmin insideZfhmin +all: postZfa postZfhmin preZfhmin postZvfhmin insideZvfhmin insideZfhmin wideningModule postZfa: inkscape $@.svg --export-type=pdf --export-filename=$@.pdf @@ -19,7 +19,7 @@ insideZfhmin: inkscape $@.svg --export-type=pdf --export-filename=$@.pdf wideningModule: - inkscape $@.sv --export-type=pdf --export-filename=$@.pdf + inkscape $@.svg --export-type=pdf --export-filename=$@.pdf clean: rm -rf *.pdf diff --git a/insideZvfhmin.svg b/insideZvfhmin.svg index 0d72d4a..8518620 100644 --- a/insideZvfhmin.svg +++ b/insideZvfhmin.svg @@ -2,13 +2,13 @@ + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> V A @@ -547,83 +547,83 @@ sodipodi:nodetypes="czczc" id="path3858" d="m 188.33622,-594.4135 c 0,0 7.8228,-20.3175 15.64562,-20.3175 7.8228,0 15.64561,20.3175 15.64561,20.3175 0,0 7.8228,20.3175 15.6456,20.3175 7.82281,0 15.64561,-20.3175 15.64561,-20.3175" - style="display:inline;fill:none;stroke:#000000;stroke-width:1.16821;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -631,28 +631,28 @@ inkscape:connector-curvature="0" id="path8370" d="M 34.944873,-152.80708 V -177.7914" - style="fill:none;stroke:#000000;stroke-width:0.992126;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:nodetypes="cc" /> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> @@ -722,102 +722,103 @@ + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + transform="translate(880.18292,-84.67653)" + style="stroke-width:0.84927356;stroke-dasharray:none"> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> @@ -883,10 +884,10 @@ sodipodi:nodetypes="cc" id="path8002-0-0-1" d="m 190.85038,-184.87702 v -21.25984" - style="fill:none;stroke:#000000;stroke-width:1.05626;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -894,29 +895,29 @@ inkscape:connector-curvature="0" id="path5210-9" d="m 282.20988,-604.844 c 0,29.1773 0,29.1773 0,29.1773" - style="display:inline;fill:none;stroke:#000000;stroke-width:1.16821;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker11340-8-9-3)" /> + style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker11340-8-9-3)" /> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> @@ -975,16 +976,16 @@ + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> @@ -993,21 +994,21 @@ sodipodi:nodetypes="cc" id="path8002-0-0-1-4" d="m 194.39369,-184.87702 v -21.25984" - style="fill:none;stroke:#000000;stroke-width:1.05626;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -1015,16 +1016,16 @@ + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> @@ -1033,39 +1034,39 @@ sodipodi:nodetypes="cc" id="path8002-0-0-1-4-5" d="m 212.11023,-184.87702 v -21.25984" - style="fill:none;stroke:#000000;stroke-width:1.05626;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -1090,46 +1091,46 @@ inkscape:connector-curvature="0" id="path5293-4-2-7-9" d="M 183.76377,-173.98812 H 197.937 l -7.08662,-10.8889 z" - style="fill:none;stroke:#000000;stroke-width:1.05151;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> @@ -1212,36 +1213,36 @@ sodipodi:nodetypes="cc" id="path8002-0-0-1-8" d="m 265.25983,-184.87702 v -21.25984" - style="fill:none;stroke:#000000;stroke-width:1.05626;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -1250,30 +1251,30 @@ sodipodi:nodetypes="cc" id="path8002-0-0-1-8-5" d="m 297.1496,-184.87702 v -21.25984" - style="fill:none;stroke:#000000;stroke-width:1.05626;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -1281,9 +1282,9 @@ + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -1308,17 +1309,17 @@ inkscape:connector-curvature="0" id="path5293-4-2-7-6" d="M 183.76377,-173.98812 H 197.937 l -7.08662,-10.8889 z" - style="fill:none;stroke:#000000;stroke-width:1.05151;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -1326,22 +1327,22 @@ + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> @@ -1349,38 +1350,38 @@ + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> PVPVmodule + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8px;line-height:1.25;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman,';text-align:center;text-anchor:middle;stroke-width:0.84927356;stroke-dasharray:none">module + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="display:inline;fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -1471,29 +1472,29 @@ inkscape:connector-curvature="0" id="path5210-9-4" d="m 271.77943,-573.5806 c 0,-29.1772 0,-29.1772 0,-29.1772" - style="display:inline;fill:none;stroke:#000000;stroke-width:1.16821;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker11340-8-9-3)" /> + style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker11340-8-9-3)" /> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> C + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> L + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> @@ -1547,92 +1548,92 @@ inkscape:connector-curvature="0" id="path5025" d="m -60.00722,231.46155 -8.24686,-3.53644 c 1.56749,-0.44945 4.57362,-3.3235 5.04502,-4.97674 z" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.54331;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:nodetypes="cccc" inkscape:transform-center-x="-1.2883224" inkscape:transform-center-y="-1.1042763" /> M + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:1;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman,';stroke-width:0.84927356;stroke-dasharray:none">M rS + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8px;line-height:1;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman,';stroke-width:0.84927356;stroke-dasharray:none">rS + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> I + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:1;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman,';stroke-width:0.84927356;stroke-dasharray:none">I s + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8px;line-height:1;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman,';stroke-width:0.84927356;stroke-dasharray:none">s + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -1713,20 +1714,20 @@ inkscape:connector-curvature="0" id="path13828-6" d="m 332.43127,-667.4264 h 4.01672" - style="display:inline;fill:none;stroke:#000000;stroke-width:1.16821;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.84927356;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> @@ -1772,54 +1773,54 @@ + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -1827,37 +1828,37 @@ + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -2064,11 +2065,11 @@ + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> @@ -2210,22 +2211,22 @@ inkscape:connector-curvature="0" id="path8252-7" d="m 646.16534,-179.56306 c -7.0866,0 -7.0866,0 -7.0866,0" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker11340-8-9)" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker11340-8-9);stroke-dasharray:none" /> @@ -2233,27 +2234,27 @@ inkscape:connector-curvature="0" id="path5446-3" d="m 646.16534,-179.56306 v 26.57481" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dasharray:none" /> @@ -2262,21 +2263,21 @@ sodipodi:nodetypes="cc" id="path8002-0-0-1-0" d="m 725.88976,-181.85426 v -10.11037" - style="fill:none;stroke:#000000;stroke-width:0.992126;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -2284,114 +2285,115 @@ + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + transform="translate(161.95486)" + style="stroke-width:1;stroke-dasharray:none"> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> @@ -2419,13 +2421,14 @@ + transform="translate(161.95486)" + style="stroke-width:1;stroke-dasharray:none"> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" /> @@ -2457,36 +2460,38 @@ sodipodi:nodetypes="cccc" id="path4721-8-7-9" d="m 841.0482,152.62249 v 26.5738 l 26.57384,-13.28691 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:0.992126;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" /> + transform="translate(161.95486)" + style="stroke-width:1;stroke-dasharray:none"> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + transform="translate(-19.488179,31.889771)" + style="stroke-width:0.84927356;stroke-dasharray:none"> @@ -2495,23 +2500,23 @@ sodipodi:nodetypes="cc" id="path4727-5-9-4" d="m 872.93699,187.16922 h 5.31496" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:0.992126;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" /> @@ -2520,28 +2525,28 @@ + style="display:inline;opacity:1;stroke-width:0.84927356;stroke-dasharray:none"> @@ -2549,96 +2554,98 @@ + style="opacity:0.407334;stroke:#000000;stroke-width:1.11963104;stroke-dasharray:none;stroke-opacity:1"> - - - - - - - - + + + + + + + + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + transform="translate(-10.629912,58.464574)" + style="stroke-width:0.84927356;stroke-dasharray:none"> @@ -2647,23 +2654,23 @@ sodipodi:nodetypes="cc" id="path4727-5-9-4-0" d="m 872.93699,187.16922 h 5.31496" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:0.992126;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:0.84927356;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" /> @@ -2671,25 +2678,25 @@ + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> R + transform="translate(161.95486)" + style="stroke-width:1;stroke-dasharray:none"> B 1 + style="font-size:8.61978px;line-height:1.25;stroke-width:1;stroke-dasharray:none">1 + transform="matrix(0.3760489,0,0,0.34302547,937.24027,-567.17114)" + style="stroke-width:2.7842912;stroke-dasharray:none"> + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.7842912;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> A + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:24px;line-height:125%;font-family:'Courier New';text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:2.7842912;stroke-dasharray:none">A 0 + style="font-size:24px;line-height:1.25;stroke-width:2.7842912;stroke-dasharray:none">0 S0 Z S1 C 2 + style="font-size:8.61978px;line-height:1.25;stroke-width:1;stroke-dasharray:none">2 D + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.61978px;line-height:125%;font-family:'Courier New';-inkscape-font-specification:'Courier New';text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1;stroke-dasharray:none">D 3 + style="font-size:8.61978px;line-height:1.25;stroke-width:1;stroke-dasharray:none">3 + transform="translate(161.95486)" + style="stroke-width:1;stroke-dasharray:none"> + transform="translate(122.73017,64.73268)" + style="stroke-width:1;stroke-dasharray:none"> + transform="matrix(0.35849717,0,0,0.35849715,608.14658,-521.4931)" + style="stroke-width:2.78942238;stroke-dasharray:none"> + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.78942238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> B + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:24px;line-height:125%;font-family:'Courier New';text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:2.78942238;stroke-dasharray:none">B 1 + style="font-size:24px;line-height:1.25;stroke-width:2.78942238;stroke-dasharray:none">1 + transform="matrix(0.35849717,0,0,0.35849715,650.96579,-521.4931)" + style="stroke-width:2.78942238;stroke-dasharray:none"> + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.78942238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> A + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:24px;line-height:125%;font-family:'Courier New';text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:2.78942238;stroke-dasharray:none">A 0 + style="font-size:24px;line-height:1.25;stroke-width:2.78942238;stroke-dasharray:none">0 S1 + transform="matrix(0.35849717,0,0,0.35849715,624.0785,-521.8516)" + style="stroke-width:2.78942238;stroke-dasharray:none"> + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.78942238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> Z + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:24px;line-height:125%;font-family:'Courier New';text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:2.78942238;stroke-dasharray:none">Z S2 + transform="matrix(0.35849717,0,0,0.35849715,610.39158,-521.43009)" + style="stroke-width:2.78942238;stroke-dasharray:none"> + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.78942238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> C + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:24px;line-height:125%;font-family:'Courier New';text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:2.78942238;stroke-dasharray:none">C 2 + style="font-size:24px;line-height:1.25;stroke-width:2.78942238;stroke-dasharray:none">2 + transform="matrix(0.35849717,0,0,0.35849715,612.81723,-521.55402)" + style="stroke-width:2.78942238;stroke-dasharray:none"> + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.78942238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> D + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:24px;line-height:125%;font-family:'Courier New';text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:2.78942238;stroke-dasharray:none">D 3 + style="font-size:24px;line-height:1.25;stroke-width:2.78942238;stroke-dasharray:none">3 + transform="matrix(0.35849717,0,0,0.35849715,601.52898,-521.55402)" + style="stroke-width:2.78942238;stroke-dasharray:none"> + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.78942238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> E + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:24px;line-height:125%;font-family:'Courier New';text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:2.78942238;stroke-dasharray:none">E 4 + style="font-size:24px;line-height:1.25;stroke-width:2.78942238;stroke-dasharray:none">4 + transform="matrix(0.35849717,0,0,0.35849715,590.24072,-521.55402)" + style="stroke-width:2.78942238;stroke-dasharray:none"> + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.78942238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> F + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:24px;line-height:125%;font-family:'Courier New';text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:2.78942238;stroke-dasharray:none">F 5 + style="font-size:24px;line-height:1.25;stroke-width:2.78942238;stroke-dasharray:none">5 + transform="matrix(0.35849717,0,0,0.35849715,578.95246,-521.55402)" + style="stroke-width:2.78942238;stroke-dasharray:none"> + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.78942238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> G + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:24px;line-height:125%;font-family:'Courier New';text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:2.78942238;stroke-dasharray:none">G 6 + style="font-size:24px;line-height:1.25;stroke-width:2.78942238;stroke-dasharray:none">6 + transform="matrix(0.35849717,0,0,0.35849715,567.66419,-521.55402)" + style="stroke-width:2.78942238;stroke-dasharray:none"> + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.78942238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> H + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:24px;line-height:125%;font-family:'Courier New';text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:2.78942238;stroke-dasharray:none">H 7 + style="font-size:24px;line-height:1.25;stroke-width:2.78942238;stroke-dasharray:none">7 S0 + transform="translate(161.95486)" + style="stroke-width:1;stroke-dasharray:none"> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + transform="translate(161.95486)" + style="stroke-width:1;stroke-dasharray:none"> + transform="translate(-16.641097,13.980675)" + style="stroke-width:1;stroke-dasharray:none"> + style="display:inline;stroke-width:1;stroke-dasharray:none" /> + style="display:inline;stroke-width:0.84927356;stroke-dasharray:none"> + transform="translate(324.59024,54.193239)" + style="stroke-width:1;stroke-dasharray:none"> A B 1 + style="font-size:8.54526px;line-height:1.25;stroke-width:1;stroke-dasharray:none">1 0 + style="font-size:8.54526px;line-height:1.25;stroke-width:1;stroke-dasharray:none">0 S0 Z - - - - - - - - 1 - 0 - is_f32f16 - - - - - + transform="rotate(180,648.68101,-505.83252)" + style="display:inline;stroke-width:1;stroke-dasharray:none"> + id="g14-8" + style="stroke-width:1;stroke-dasharray:none"> - - - - - + + + + + 1 - 1 + 0 + id="text2806-1-1-8-2-4" + transform="rotate(-90)">0 + is_f32f16 + y="718.75696" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.69684px;line-height:125%;font-family:'Courier New';text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1;stroke-dasharray:none">is_f32f16 result_o + status_o + transform="translate(161.95486)" + style="stroke-width:1;stroke-dasharray:none"> A B 1 + style="font-size:8.54526px;line-height:1.25;stroke-width:1;stroke-dasharray:none">1 0 + style="font-size:8.54526px;line-height:1.25;stroke-width:1;stroke-dasharray:none">0 S0 Z - - - - - - - - - - + + + + + + 31:0 + style="stroke-width:1;stroke-dasharray:none" + x="405.79568" + y="-669.11774">31:0 FP32FP32TOFP16 FP32FP32TOFP16 FP32FP32TOFP16 FP32FP32TOFP16 FP16TOFP32 FP16TOFP32 FP16TOFP32 FP16TOFP32 63:32 + style="stroke-width:1;stroke-dasharray:none" + x="443.12454" + y="-669.12018">63:32 95:64 + style="stroke-width:1;stroke-dasharray:none" + x="480.58771" + y="-669.12018">95:64 127:96 instruction_i + style="stroke-width:1;stroke-dasharray:none" + x="542.38031" + y="-719.18182" + id="tspan2-2">operand_i 15:0 + style="stroke-width:1;stroke-dasharray:none" + x="563.63721" + y="-669.11774">15:0 31:16 + style="stroke-width:1;stroke-dasharray:none" + x="600.43683" + y="-669.12018">31:16 47:32 + style="stroke-width:1;stroke-dasharray:none" + x="637.90002" + y="-669.12018">47:32 63:48 - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + status_o + style="stroke-width:1;stroke-dasharray:none" + x="594.06958" + y="-531.56183" + id="tspan2-2-4">status + result - - - - - - diff --git a/postZfa.svg b/postZfa.svg index 9525d7c..e8e446e 100644 --- a/postZfa.svg +++ b/postZfa.svg @@ -23,15 +23,15 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="276.5" - inkscape:cy="279.5" + inkscape:zoom="1.4142136" + inkscape:cx="260.56885" + inkscape:cy="389.26228" inkscape:document-units="mm" - inkscape:current-layer="g1" + inkscape:current-layer="layer1" showgrid="false" units="mm" inkscape:window-width="1920" - inkscape:window-height="1052" + inkscape:window-height="1008" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" @@ -676,6 +676,14 @@ cy="-627.78961" r="2.0860951" inkscape:transform-center-y="-4.4586184e-06" /> + + diff --git a/wideningModule.svg b/wideningModule.svg index 94f215c..624d1fb 100644 --- a/wideningModule.svg +++ b/wideningModule.svg @@ -3,12 +3,12 @@ + + + + + + + + + + @@ -676,6 +732,78 @@ cy="-627.78961" r="2.0860951" inkscape:transform-center-y="-4.4586184e-06" /> + + + + + + + + + S0 - - - - - 1 - - - - 0 - - - S1 - - - - - S2 - - - 2 - - - - 3 - - - - 4 - - - - 5 - - - - 6 - - - - 7 - - - S0 - @@ -3456,425 +3354,243 @@ y="-580.1264" /> - - FUNCUNIT - - - - - - - - - CVFPU - - - - - - - - VFREDO - - - - - + id="g24-7" + transform="translate(-291.66303,-101.60763)" + style="display:inline"> + + + - - VF7 - - - - - VRED instruction_i + id="tspan2-6-5-5-9-3">operand_i [14:10] + [9:0] + [31] + [30:0] + [30:23] + [22:0] + [30:23] + [15] + [31] + instruction_o - - - - - - - VFRED - - - - - - - - ZVFHMIN - - - - - - - - FUNCUNIT - - - - - - - + id="tspan2-6-5-5-9-3-4">112 + 13 + operand_o + status_o Z + + + + + << + + + + + << + + + + + + + + + << + + LZC + + + + + + + + + + + + + + + + + + + + + + + 1 + 0 + + + + + + + + 1 + 0 + + + + + + + + 1 + 0 + frac16 == 0 + + + + + + + 1 + 0 + exp16 == 0 + is_nan_i + is_snan_i + + + + + + + + + 112 + 0 + QNAN + 0 + NV + [22:0]