Merge branch 'matthiasc/for-master' into 'master'

Matthiasc/for master

See merge request GNOME/gtk!2504

gtk/css/gtkcsstokenizer.c

@@ -1056,13 +1056,12 @@ gtk_css_tokenizer_read_numeric (GtkCssTokenizer *tokenizer,
         }
     }
 
-  if (data + 1 < tokenizer->end && (*data == 'e' || *data == 'E') && 
-      (g_ascii_isdigit (data[1]) || 
-       (data + 2 < tokenizer->end && (data[1] == '+' || data[2] == '-') && g_ascii_isdigit (data[2]))))
+  if (data + 1 < tokenizer->end && (*data == 'e' || *data == 'E') &&
+      (g_ascii_isdigit (data[1]) ||
+       (data + 2 < tokenizer->end && (data[1] == '+' || data[1] == '-') && g_ascii_isdigit (data[2]))))
     {
       is_int = FALSE;
       data++;
-      exponent = g_ascii_digit_value (*data);
 
       if (*data == '-')
         {

testsuite/css/parser/number-values.css

@@ -0,0 +1,31 @@
+a {
+  -gtk-dpi: 0;
+}
+
+b {
+  -gtk-dpi: 100;
+}
+
+c {
+  -gtk-dpi: -39;
+}
+
+d {
+  -gtk-dpi: 0.5;
+}
+
+e {
+  -gtk-dpi: 2.6e2;
+}
+
+f {
+  -gtk-dpi: 2.6E20;
+}
+
+g {
+  -gtk-dpi: 5e-1;
+}
+
+h {
+  -gtk-dpi: 2E-19;
+}

testsuite/css/parser/number-values.ref.css

@@ -0,0 +1,31 @@
+a {
+  -gtk-dpi: 0;
+}
+
+b {
+  -gtk-dpi: 100;
+}
+
+c {
+  -gtk-dpi: -39;
+}
+
+d {
+  -gtk-dpi: 0.5;
+}
+
+e {
+  -gtk-dpi: 260;
+}
+
+f {
+  -gtk-dpi: 2.6e+20;
+}
+
+g {
+  -gtk-dpi: 0.5;
+}
+
+h {
+  -gtk-dpi: 2e-19;
+}