Changeset 13384 in josm for trunk

Timestamp:

2018-02-04T16:44:26+01:00 (6 years ago)

Author:

stoecker

Message:

see #13158 - fix geticons.pl to no skip some checks

Location:

trunk

Files:

• images/presets/misc/grave.svg (modified) (1 diff)
• images/presets/shop/boutique.svg (modified) (1 diff)
• images/presets/shop/copyshop.svg (modified) (1 diff)
• scripts/geticons.pl (modified) (1 diff)

trunk/images/presets/misc/grave.svg

@@ -77 +77 @@
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-transform:none;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke-width:0.03334057;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       style="color:#000000;line-height:normal;font-family:'Bitstream Vera Sans';text-indent:0;text-align:start;text-transform:none;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke-width:0.03334057;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 8,1037.3626 c -2.73333,0 -3.66667,1.973 -3.66667,1.973 L 3,1039.3622 l 1,11 h 8 l 1,-11 -1.33333,-0.027 c 0,0 -0.93334,-1.973 -3.66667,-1.973 z m -3,4.9996 h 6 v 1 H 5 Z m 0,2 h 6 v 1 H 5 Z m -3,7 v 2 h 12 v -2 z"
        overflow="visible"

trunk/images/presets/shop/boutique.svg

@@ -102 +102 @@
        ry="2.4061453" />
     <g
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.46151066px;line-height:125%;font-family:'CommercialScript BT';-inkscape-font-specification:'CommercialScript BT, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.46151066px;line-height:125%;font-family:'CommercialScript BT';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        id="text4151"
        transform="matrix(1.0286235,0,0,1.1000318,-0.28204197,-104.97547)">

trunk/images/presets/shop/copyshop.svg

@@ -427 +427 @@
   <g
      transform="matrix(39.181587,0,0,39.181587,136.13818,-41283.329)"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.93952465px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';fill:#e5afe5;fill-opacity:1;stroke:none"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.93952465px;font-family:'DejaVu Sans Mono';fill:#e5afe5;fill-opacity:1;stroke:none"
      id="text3805-2" />
   <g

trunk/scripts/geticons.pl

@@ -152 +152 @@
         my $f = <FILE>;
         close FILE;
-        while($f =~ /style\s*=\s*["']([^"']+)["']/g)
+        for my $sep ("'", '"')
         {
-          for my $x (split(/\s*;\s*/, $1))
+          while($f =~ /style\s*=\s*$sep([^$sep]+)$sep/g)
           {
-            print STDERR "$ifile: Style starts with minus: $x\n" if $x =~ /^-/;
+            for my $x (split(/\s*;\s*/, $1))
+            {
+              print STDERR "$ifile: Style starts with minus: $x\n" if $x =~ /^-/;
+            }
           }
         }