Changeset 18115 in josm for trunk/scripts

Timestamp:

2021-08-02T17:44:33+02:00 (4 years ago)

Author:

stoecker

Message:

add font-checks to geticons.pl, see #21143

File:

• trunk/scripts/geticons.pl (modified) (5 diffs)

trunk/scripts/geticons.pl

@@ -12 +12 @@
   "src/org/openstreetmap/josm/*/*/*/*.java",
   "src/org/openstreetmap/josm/*/*/*/*/*.java",
-  "src/org/openstreetmap/josm/*/*/*/*/*/*.java"
+  "src/org/openstreetmap/josm/*/*/*/*/*/*.java",
+  "src/org/openstreetmap/josm/*/*/*/*/*/*/*.java"
 );
 
@@ -41 +42 @@
       if($l =~ /icon\s*[:=]\s*["']([^"'+]+?)["']/)
       {
-        ++$icons{$1};
+        my $i = $1;
+        ++$icons{$i};
       }
 
       if(($l =~ /(?:icon-image|repeat-image|fill-image)\s*:\s*(\"?(.*?)\"?)\s*;/) && ($1 ne "none"))
       {
-        my $img = $2;
-        ++$icons{$img};
+        my $i = $2;
+        ++$icons{$i};
       }
       if($l =~ /ImageProvider(?:\.get)?\(\"([^\"]*?)\"(?:, (?:ImageProvider\.)?ImageSizes\.[A-Z]+)?\)/)
@@ -149 +151 @@
       if(open FILE, "<","resources/images/$ifile")
       {
+        my $hadfont = 0;
         undef $/;
         my $f = <FILE>;
@@ -159 +162 @@
             {
               print STDERR "$ifile: Style starts with minus: $x\n" if $x =~ /^-/;
+              ++$hadfont if($x =~ /^font-/);
+              if($x =~ /^font-family:(.*)$/ && $x !~ /^font-family:'Droid Sans'/)
+              {
+                print STDERR "$ifile: Unwanted font-family: $1\n" 
+              }
             }
           }
@@ -170 +178 @@
           my $x = $1;
           print STDERR "$ifile: ViewBox has float values: $x\n" if $x =~ /\./;
+        }
+        if($f !~ /<text/ && $hadfont)
+        {
+          print STDERR "$ifile: Font-style without <text>\n";
         }
       }