From 1b1de3b5b90e205e8217c3fb92ccdb0f55279730 Mon Sep 17 00:00:00 2001
From: Lertsenem <lertsenem@lertsenem.com>
Date: Thu, 23 Jul 2020 18:02:11 +0200
Subject: [PATCH] Fix template reboot2020 for inkscape

The generated svg were ok for FF, but images were wrong on Inkscape,
which can be used to create png exports...

The fix is modifying the width=auto to with=2000 while setting the
preserveRatioAspect to xMinYMin. Also, the secondary and pocket chars
needed to be put inside groups unless the main char image disappeared,
for some reason...
---
 .../templates/rebootlyon2020/template.svg.j2  | 60 ++++++++++++++-----
 1 file changed, 46 insertions(+), 14 deletions(-)

diff --git a/lokrez/templates/rebootlyon2020/template.svg.j2 b/lokrez/templates/rebootlyon2020/template.svg.j2
index d201346..fcb7f2d 100644
--- a/lokrez/templates/rebootlyon2020/template.svg.j2
+++ b/lokrez/templates/rebootlyon2020/template.svg.j2
@@ -892,6 +892,7 @@
            y="141.60774" />
       </g>
      {% if players[0].get_mains()[1] %}
+      <g>
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[0].get_mains()[1][0]|e}}/chara_2_{{players[0].get_mains()[1][0]|e}}_{{players[0].get_mains()[1][1]}}.png"
          inkscape:svg-dpi="1"
@@ -902,8 +903,10 @@
          width="14.324512"
          x="158.4778"
          y="125.98183" />
+       </g>
      {% endif %}
      {% if players[0].get_mains()[2] %}
+      <g>
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[0].get_mains()[2][0]|e}}/chara_2_{{players[0].get_mains()[2][0]|e}}_{{players[0].get_mains()[2][1]}}.png"
          y="141.06041"
@@ -914,6 +917,7 @@
          style="display:inline;image-rendering:optimizeQuality"
          id="player1_3_img"
          inkscape:svg-dpi="1" />
+       </g>
      {% endif %}
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[0].get_mains()[0][0]|e}}/chara_3_{{players[0].get_mains()[0][0]|e}}_{{players[0].get_mains()[0][1]}}.png"
@@ -1023,6 +1027,7 @@
            style="opacity:1;vector-effect:none;fill:url(#colorPlayerSecondary);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5972681;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers stroke fill" />
       </g>
      {% if players[1].get_mains()[2] %}
+      <g>
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[1].get_mains()[2][0]|e}}/chara_2_{{players[1].get_mains()[2][0]|e}}_{{players[1].get_mains()[2][1]}}.png"
          id="player2_3_img"
@@ -1033,8 +1038,10 @@
          x="158.4778"
          y="180.64343"
          inkscape:svg-dpi="1" />
+       </g>
      {% endif %}
      {% if players[1].get_mains()[1] %}
+      <g>
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[1].get_mains()[1][0]|e}}/chara_2_{{players[1].get_mains()[1][0]|e}}_{{players[1].get_mains()[1][1]}}.png"
          y="165.56485"
@@ -1045,14 +1052,15 @@
          style="display:inline;image-rendering:optimizeQuality"
          id="player2_2_img"
          inkscape:svg-dpi="1" />
+       </g>
      {% endif %}
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[1].get_mains()[0][0]|e}}/chara_3_{{players[1].get_mains()[0][0]|e}}_{{players[1].get_mains()[0][1]}}.png"
          x="{{ "{:.5f}".format( 51 + charcorr.charcorr[players[1].get_mains()[0][0]][0] ) }}"
          y="{{ "{:.5f}".format( 124.7 + 39.6 + charcorr.charcorr[players[1].get_mains()[0][0]][1] ) }}"
-         width="auto"
+         width="2000"
          height="20%"
-         preserveAspectRatio="none"
+         preserveAspectRatio="xMinYMin meet"
          style="display:inline;image-rendering:optimizeQuality"
          id="player2_img"
          mask="url(#player2_msk)"
@@ -1154,6 +1162,7 @@
            y="141.60774" />
       </g>
      {% if players[2].get_mains()[1] %}
+      <g>
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[2].get_mains()[1][0]|e}}/chara_2_{{players[2].get_mains()[1][0]|e}}_{{players[2].get_mains()[1][1]}}.png"
          y="204.72319"
@@ -1164,8 +1173,10 @@
          style="display:inline;image-rendering:optimizeQuality"
          id="player3_2_img"
          inkscape:svg-dpi="1" />
+       </g>
      {% endif %}
      {% if players[2].get_mains()[2] %}
+      <g>
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[2].get_mains()[2][0]|e}}/chara_2_{{players[2].get_mains()[2][0]|e}}_{{players[2].get_mains()[2][1]}}.png"
          id="player3_3_img"
@@ -1176,14 +1187,15 @@
          x="158.4778"
          y="219.80177"
          inkscape:svg-dpi="1" />
+       </g>
      {% endif %}
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[2].get_mains()[0][0]|e}}/chara_3_{{players[2].get_mains()[0][0]|e}}_{{players[2].get_mains()[0][1]}}.png"
          x="{{ "{:.5f}".format( 51 + charcorr.charcorr[players[2].get_mains()[0][0]][0] ) }}"
          y="{{ "{:.5f}".format( 124.7 + 2*39.6 + charcorr.charcorr[players[2].get_mains()[0][0]][1] ) }}"
-         width="auto"
+         width="2000"
          height="20%"
-         preserveAspectRatio="none"
+         preserveAspectRatio="xMinYMin meet"
          style="display:inline;image-rendering:optimizeQuality"
          id="player3_img"
          mask="url(#player3_msk)"
@@ -1285,6 +1297,7 @@
            style="opacity:1;vector-effect:none;fill:url(#colorPlayerSecondary);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5972681;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers stroke fill" />
       </g>
      {% if players[3].get_mains()[2] %}
+      <g>
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[3].get_mains()[2][0]|e}}/chara_2_{{players[3].get_mains()[2][0]|e}}_{{players[3].get_mains()[2][1]}}.png"
          id="player4_3_img"
@@ -1295,8 +1308,10 @@
          x="158.4778"
          y="260.01846"
          inkscape:svg-dpi="1" />
+       </g>
      {% endif %}
      {% if players[3].get_mains()[1] %}
+      <g>
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[3].get_mains()[1][0]|e}}/chara_2_{{players[3].get_mains()[1][0]|e}}_{{players[3].get_mains()[1][1]}}.png"
          y="244.93987"
@@ -1307,6 +1322,7 @@
          style="display:inline;image-rendering:optimizeQuality"
          id="player4_2_img"
          inkscape:svg-dpi="1" />
+       </g>
      {% endif %}
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[3].get_mains()[0][0]|e}}/chara_3_{{players[3].get_mains()[0][0]|e}}_{{players[3].get_mains()[0][1]}}.png"
@@ -1315,9 +1331,9 @@
          mask="url(#player4_msk)"
          id="player4_img"
          style="display:inline;image-rendering:optimizeQuality"
-         preserveAspectRatio="none"
-         width="auto"
+         width="2000"
          height="20%"
+         preserveAspectRatio="xMinYMin meet"
          inkscape:svg-dpi="1" />
       <text
          inkscape:label="#playertag"
@@ -1416,6 +1432,7 @@
            y="141.60774" />
       </g>
      {% if players[4].get_mains()[2] %}
+      <g>
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[4].get_mains()[2][0]|e}}/chara_2_{{players[4].get_mains()[2][0]|e}}_{{players[4].get_mains()[2][1]}}.png"
          y="300.23517"
@@ -1426,8 +1443,10 @@
          style="display:inline;image-rendering:optimizeQuality"
          id="player5a_3_img"
          inkscape:svg-dpi="1" />
+       </g>
      {% endif %}
      {% if players[4].get_mains()[1] %}
+      <g>
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[4].get_mains()[1][0]|e}}/chara_2_{{players[4].get_mains()[1][0]|e}}_{{players[4].get_mains()[1][1]}}.png"
          id="player5a_2_img"
@@ -1438,14 +1457,15 @@
          x="158.4778"
          y="285.15659"
          inkscape:svg-dpi="1" />
+       </g>
      {% endif %}
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[4].get_mains()[0][0]|e}}/chara_3_{{players[4].get_mains()[0][0]|e}}_{{players[4].get_mains()[0][1]}}.png"
          x="{{ "{:.5f}".format( 51 + charcorr.charcorr[players[4].get_mains()[0][0]][0] ) }}"
          y="{{ "{:.5f}".format( 124.7 + 4*39.6 + charcorr.charcorr[players[4].get_mains()[0][0]][1] ) }}"
-         width="auto"
+         width="2000"
          height="20%"
-         preserveAspectRatio="none"
+         preserveAspectRatio="xMinYMin meet"
          style="display:inline;image-rendering:optimizeQuality"
          id="player5a_img"
          mask="url(#player5a_msk)"
@@ -1547,6 +1567,7 @@
            style="opacity:1;vector-effect:none;fill:url(#colorPlayerSecondary);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5972681;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers stroke fill" />
       </g>
      {% if players[5].get_mains()[2] %}
+      <g>
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[5].get_mains()[2][0]|e}}/chara_2_{{players[5].get_mains()[2][0]|e}}_{{players[5].get_mains()[2][1]}}.png"
          id="player5b_3_img"
@@ -1557,8 +1578,10 @@
          x="158.4778"
          y="339.9227"
          inkscape:svg-dpi="1" />
+       </g>
      {% endif %}
      {% if players[5].get_mains()[1] %}
+      <g>
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[5].get_mains()[1][0]|e}}/chara_2_{{players[5].get_mains()[1][0]|e}}_{{players[5].get_mains()[1][1]}}.png"
          y="324.84415"
@@ -1569,6 +1592,7 @@
          style="display:inline;image-rendering:optimizeQuality"
          id="player5b_2_img"
          inkscape:svg-dpi="1" />
+       </g>
      {% endif %}
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[5].get_mains()[0][0]|e}}/chara_3_{{players[5].get_mains()[0][0]|e}}_{{players[5].get_mains()[0][1]}}.png"
@@ -1577,8 +1601,8 @@
          mask="url(#player5b_msk)"
          id="player5b_img"
          style="display:inline;image-rendering:optimizeQuality"
-         preserveAspectRatio="none"
-         width="auto"
+         preserveAspectRatio="xMinYMin meet"
+         width="2000"
          height="20%"
          inkscape:svg-dpi="1" />
       <text
@@ -1678,6 +1702,7 @@
            y="141.60774" />
       </g>
      {% if players[6].get_mains()[2] %}
+      <g>
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[6].get_mains()[2][0]|e}}/chara_2_{{players[6].get_mains()[2][0]|e}}_{{players[6].get_mains()[2][1]}}.png"
          y="380.1394"
@@ -1688,8 +1713,10 @@
          style="display:inline;image-rendering:optimizeQuality"
          id="player7a_3_img"
          inkscape:svg-dpi="1" />
+       </g>
      {% endif %}
      {% if players[6].get_mains()[1] %}
+      <g>
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[6].get_mains()[1][0]|e}}/chara_2_{{players[6].get_mains()[1][0]|e}}_{{players[6].get_mains()[1][1]}}.png"
          id="player7a_2_img"
@@ -1700,14 +1727,15 @@
          x="158.4778"
          y="365.06085"
          inkscape:svg-dpi="1" />
+       </g>
      {% endif %}
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[6].get_mains()[0][0]|e}}/chara_3_{{players[6].get_mains()[0][0]|e}}_{{players[6].get_mains()[0][1]}}.png"
          x="{{ "{:.5f}".format( 51 + charcorr.charcorr[players[6].get_mains()[0][0]][0] ) }}"
          y="{{ "{:.5f}".format( 124.7 + 6*39.6 + charcorr.charcorr[players[6].get_mains()[0][0]][1] ) }}"
-         width="auto"
+         width="2000"
          height="20%"
-         preserveAspectRatio="none"
+         preserveAspectRatio="xMinYMin meet"
          style="display:inline;image-rendering:optimizeQuality"
          id="player7a_img"
          mask="url(#player7a_msk)"
@@ -1809,6 +1837,7 @@
            style="opacity:1;vector-effect:none;fill:url(#colorPlayerSecondary);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5972681;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers stroke fill" />
       </g>
      {% if players[7].get_mains()[2] %}
+      <g>
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[7].get_mains()[2][0]|e}}/chara_2_{{players[7].get_mains()[2][0]|e}}_{{players[7].get_mains()[2][1]}}.png"
          id="player7b_3_img"
@@ -1819,8 +1848,10 @@
          x="158.4778"
          y="420.88528"
          inkscape:svg-dpi="1" />
+       </g>
      {% endif %}
      {% if players[7].get_mains()[1] %}
+      <g>
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[7].get_mains()[1][0]|e}}/chara_2_{{players[7].get_mains()[1][0]|e}}_{{players[7].get_mains()[1][1]}}.png"
          y="405.8067"
@@ -1831,6 +1862,7 @@
          style="display:inline;image-rendering:optimizeQuality"
          id="player7b_2_img"
          inkscape:svg-dpi="1" />
+       </g>
      {% endif %}
       <image
          xlink:href="{{dir_res_ssbu}}/{{players[7].get_mains()[0][0]|e}}/chara_3_{{players[7].get_mains()[0][0]|e}}_{{players[7].get_mains()[0][1]}}.png"
@@ -1839,8 +1871,8 @@
          mask="url(#player7b_msk)"
          id="player7b_img"
          style="display:inline;image-rendering:optimizeQuality"
-         preserveAspectRatio="none"
-         width="auto"
+         preserveAspectRatio="xMinYMin meet"
+         width="2000"
          height="20%"
          inkscape:svg-dpi="1" />
       <text